Skip to content

Conversation

belovdv
Copy link
Contributor

@belovdv belovdv commented Apr 5, 2024

Reverts #123469.

r? @ghost

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 5, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 5, 2024

The Miri subtree was changed

cc @rust-lang/miri

@belovdv belovdv marked this pull request as draft April 5, 2024 16:12
@RalfJung
Copy link
Member

RalfJung commented Apr 5, 2024

Why is this a draft?
r? @RalfJung

@oli-obk oli-obk marked this pull request as ready for review April 5, 2024 16:23
@oli-obk
Copy link
Contributor

oli-obk commented Apr 5, 2024

@bors r=RalfJung,oli-obk

@bors
Copy link
Collaborator

bors commented Apr 5, 2024

📌 Commit 8cfd199 has been approved by RalfJung,oli-obk

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 5, 2024
@RalfJung
Copy link
Member

RalfJung commented Apr 5, 2024

This also fixes ./x.py test miri printing some annoying warnings

warning: failed to connect to jobserver from environment variable `CARGO_MAKEFLAGS="-j --jobserver-fds=8,9 --jobserver-auth=8,9"`: cannot open file descriptor 8 from the jobserver environment variable value: Bad file descriptor (os error 9)
  |
  = note: the build environment is likely misconfigured

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Apr 5, 2024
…e, r=RalfJung,oli-obk

Revert removing miri jobserver workaround

Reverts rust-lang#123469.

r? `@ghost`
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 5, 2024
…llaumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#121419 (Add aarch64-apple-visionos and aarch64-apple-visionos-sim tier 3 targets)
 - rust-lang#123159 (Fix target-cpu fpu features on Arm R/M-profile)
 - rust-lang#123487 (CFI: Restore typeid_for_instance default behavior)
 - rust-lang#123500 (Revert removing miri jobserver workaround)
 - rust-lang#123505 (Revert "Use OS thread name by default")
 - rust-lang#123509 (Add jieyouxu to compiler review rotation and as a reviewer for `tests/run-make`, `src/tools/run-make-support` and `src/tools/compiletest`)
 - rust-lang#123514 (Fix typo in `compiler/rustc_middle/src/traits/solve/inspect.rs`)
 - rust-lang#123515 (Use `include` command to reduce code duplication)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8a6f9a1 into rust-lang:master Apr 6, 2024
@rustbot rustbot added this to the 1.79.0 milestone Apr 6, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 6, 2024
Rollup merge of rust-lang#123500 - belovdv:remove-miri-jobserver-fixme, r=RalfJung,oli-obk

Revert removing miri jobserver workaround

Reverts rust-lang#123469.

r? ``@ghost``
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants